Policy change on -N - it now means "don't change fields based on other fields" instea...

and magellan protocols just becuase we happen to know them.)

diff --git a/gpsbabel/garmin.c b/gpsbabel/garmin.c
index 3dc15938f91615e3c94b1ef18af697e0b18d5c20..d0e59fa773c1008a3d53a3e8f68c4d55d7c98097 100644 (file)
--- a/gpsbabel/garmin.c
+++ b/gpsbabel/garmin.c
@@ -469,7 +469,8 @@ waypoint_write(void)
                }
                way[i]->ident[sizeof(way[i]->ident)-1] = 0;
 
-               if (wpt->gc_data.diff && wpt->gc_data.terr) {
+               if (!global_opts.no_smart_icons && 
+                    wpt->gc_data.diff && wpt->gc_data.terr) {
                        snprintf(obuf, sizeof(obuf), "%s%d/%d %s", 
                                        get_gc_info(wpt),
                                        wpt->gc_data.diff, wpt->gc_data.terr, 

diff --git a/gpsbabel/magproto.c b/gpsbabel/magproto.c
index cd41c0752183982097a81c856a070149c65482e6..2141314cd36efb4ef8ea356d871e81aae3d97b3d 100644 (file)
--- a/gpsbabel/magproto.c
+++ b/gpsbabel/magproto.c
@@ -1201,7 +1201,8 @@ mag_waypt_pr(const waypoint *waypointp)
        odesc = isrc ? isrc : "";
        owpt = mag_cleanse(owpt);
 
-       if (waypointp->gc_data.diff && waypointp->gc_data.terr) {
+       if (!global_opts.no_smart_icons &&
+           waypointp->gc_data.diff && waypointp->gc_data.terr) {
                sprintf(ofmtdesc, "%d/%d %s", waypointp->gc_data.diff, 
                        waypointp->gc_data.terr, odesc);
                odesc = mag_cleanse(ofmtdesc);